[Win32] Bypass libtool, use -Wl,-luuid. This avoids a libtool warning as

2005-07-18  Tor Lillqvist  <tml@novell.com>

	* configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
	-Wl,-luuid. This avoids a libtool warning as libuuid is static.

	* gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
	any possible leftover clipping region in the DC if we don't want
	any clipping. Thanks to Robert Ögren. (#309823)

diff --git a/ChangeLog b/ChangeLog
index f18797c16039b2f186cf32f3ffef0434a868b99d..a4d916a9015a2587d0a54e4b2482c315c38052a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-18  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
+       any possible leftover clipping region in the DC if we don't want
+       any clipping. Thanks to Robert Ögren. (#309823)
+
+       * configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
+       -Wl,-luuid. This avoids a libtool warning as libuuid is static.
+
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@@ -180,7 +189,7 @@
 
        * configure.in: Check that we have a new enough Cairo.
 
-2005-07-13  Robert Ögren  <gtk@roboros.com>
+2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
        on Windows. (#167004, thanks to "pnohant" for testing)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f18797c16039b2f186cf32f3ffef0434a868b99d..a4d916a9015a2587d0a54e4b2482c315c38052a9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-07-18  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
+       any possible leftover clipping region in the DC if we don't want
+       any clipping. Thanks to Robert Ögren. (#309823)
+
+       * configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
+       -Wl,-luuid. This avoids a libtool warning as libuuid is static.
+
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@@ -180,7 +189,7 @@
 
        * configure.in: Check that we have a new enough Cairo.
 
-2005-07-13  Robert Ögren  <gtk@roboros.com>
+2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
        on Windows. (#167004, thanks to "pnohant" for testing)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f18797c16039b2f186cf32f3ffef0434a868b99d..a4d916a9015a2587d0a54e4b2482c315c38052a9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-07-18  Tor Lillqvist  <tml@novell.com>
+
+       * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove
+       any possible leftover clipping region in the DC if we don't want
+       any clipping. Thanks to Robert Ögren. (#309823)
+
+       * configure.in (GDK_EXTRA_LIBS): [Win32] Bypass libtool, use
+       -Wl,-luuid. This avoids a libtool warning as libuuid is static.
+
 2005-07-18  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_set_focus_on_click): Propagate
@@ -180,7 +189,7 @@
 
        * configure.in: Check that we have a new enough Cairo.
 
-2005-07-13  Robert Ögren  <gtk@roboros.com>
+2005-07-13  Robert Ögren  <gtk@roboros.com>
 
        Fix handling of Aiptek and Aiptek-like graphical tablets such as Trust
        on Windows. (#167004, thanks to "pnohant" for testing)

diff --git a/configure.in b/configure.in
index 3c9b86c20bb10f50add602f7caa119d9f5aee373..c87b44a1e0ddbdcee285cf8bcec96c2ebf6c0088 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1366,7 +1366,7 @@ if test "x$gdktarget" = "xwin32"; then
     AC_SUBST(GDK_WIN32_EXTRA_CFLAGS)
   fi
 
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -luuid"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -Wl,-luuid"
   AM_CONDITIONAL(USE_WIN32, true)
 else
   AM_CONDITIONAL(USE_WIN32, false)

diff --git a/gdk/win32/gdkgc-win32.c b/gdk/win32/gdkgc-win32.c
index f1cc6c3c17e4b06e69e09631888d535016e77de7..51c927ffaade2e8e7b694262b489fd63a4ee6f45 100644 (file)
--- a/gdk/win32/gdkgc-win32.c
+++ b/gdk/win32/gdkgc-win32.c
@@ -925,6 +925,8 @@ gdk_win32_hdc_get (GdkDrawable    *drawable,
            win32_gc->values_mask & GDK_GC_CLIP_Y_ORIGIN ? gc->clip_y_origin : 0) == ERROR)
        WIN32_API_FAILED ("OffsetClipRgn"), ok = FALSE;
     }
+  else if (ok)
+    SelectClipRgn (win32_gc->hdc, NULL);
 
   GDK_NOTE (GC, (g_print ("gdk_win32_hdc_get: %p (%s): ",
                          win32_gc, _gdk_win32_gcvalues_mask_to_string (usage)),